merge trunk
authorKenichi Handa <handa@gnu.org>
Tue, 13 Nov 2012 14:24:26 +0000 (23:24 +0900)
committerKenichi Handa <handa@gnu.org>
Tue, 13 Nov 2012 14:24:26 +0000 (23:24 +0900)
commit737b9b67c5c2e4e1fc6a2d6355949488ba0256d5
tree9fd80393342bde635f5e96e0c141a76dd3a0351f
parent3b705cd02cf240454f5d934fb8839c09f8b34455
parent303ecaf0c015101eb893e3a5d53511d5a7be0af8
merge trunk
src/ChangeLog
src/font.c